swss-common: Changes to support SONiC Gearbox Manager #347

sydlogan · 2020-06-02T17:39:06Z

add class GearboxUtils, contains APIs useful for gearbox support across various submodules.
add additional REDIS tables to support second (PHY) syncd.

Signed-off-by: syd.logan@broadcom.com

* add class GearboxUtils, contains APIs useful for gearbox support across various submodules. * add additional REDIS tables to support second (PHY) syncd. Signed-off-by: syd.logan@broadcom.com

ghost · 2020-06-02T17:39:19Z

All CLA requirements met.

common/gearboxutils.cpp

lguohan · 2020-06-08T19:11:01Z

common/table.cpp

+   { PFC_WD_DB,         TABLE_NAME_SEPARATOR_COLON },
+   { FLEX_COUNTER_DB,   TABLE_NAME_SEPARATOR_COLON },
+   { STATE_DB,          TABLE_NAME_SEPARATOR_VBAR  },
+   { ASIC_DB2,          TABLE_NAME_SEPARATOR_VBAR  },


what is ASIC_DB2? it is unclear what it is.

Hi Guohan;

The new ASIC_DB2 (as well as counters, flex, and state) database designations are being used by Gearbox and the new PHY SYNCD DOCKER.
These definitions are also specified in the specific HWSKU context_config.json files, such as in the following excerpt;

{
"guid" : 1,
"name" : "phy1",
"dbAsic" : "ASIC_DB2",
"dbCounters" : "COUNTERS_DB2",
"dbFlex": "FLEX_COUNTER_DB2",
"dbState" : "STATE_DB2",
"switches": [
{
"index" : 1,
"hwinfo" : ""
}
]
}

I think we should rename it to PHY_DB

Just thinking ahead here...
The design supports multiple phys for which each phy "could" have their own set of databases.
So I'm guessing the naming scheme made something like?
PHY_DB
PHY_DB2
etc...
?

We used asic_db2 because we antiipate multiple switches in the future, and phy and switch are not differentiated in sairedis, so I believe we should give them all the same name. In the future, we may have multiredis support and we might then consider not needing this (redis then become namespace for the table names, one redis per switch). Please accept the change as it currently is proposed, future this might change but for now, asic_db2 is most consistent naming for switch related tables.

I think all the phy db can be put into the same db since there are not much query/config activities. I think PHY_DB is a better name and give user more information on the nature of this db.

just to clarify, a added "2" for each of second db names since i didn't have any better name, we could add PHY or GB (as gearbox) prefixx or something more explanatory then just "2"

common/Makefile.am

ben-gale · 2020-06-10T19:11:18Z

Please Merge this ASAP as we have other dependent PR's pending on this.

sydlogan · 2020-06-12T16:21:27Z

@lguohan removed gearboxutils, explained why the naming convention was chosen. Re-requesting review. Thanks!

common/schema.h

…remove STATE_DB2

sydlogan · 2020-06-16T20:22:18Z

@lguohan thank you for the review and approval

… support VS gearbox phy feature * scripts and configuration needed to support a second syncd docker (physyncd) * physyncd supports gearbox device and phy SAI APIs and runs multiple instances of syncd, one per phy in the device * support for VS target (sonic-sairedis vslib has been extended to support a virtual BCM81724 gearbox PHY). HLD is located at https://github.com/Azure/SONiC/blob/b817a12fd89520d3fd26bbc5897487928e7f6de7/doc/gearbox/gearbox_mgr_design.md **- Why I did it** This work is part of the gearbox phy joint effort between Microsoft and Broadcom, and is based on multi-switch support in sonic-sairedis. **- How I did it** Overall feature was implemented across several projects. The collective pull requests (some in late stages of review at this point): sonic-net/sonic-utilities#931 - CLI (merged) sonic-net/sonic-swss-common#347 - Minor changes (merged) sonic-net/sonic-swss#1321 - gearsyncd, config parsers, changes to orchargent to create gearbox phy on supported systems sonic-net/sonic-sairedis#624 - physyncd, virtual BCM81724 gearbox phy added to vslib **- How to verify it** In a vslib build: root@sonic:/home/admin# show gearbox interfaces status PHY Id Interface MAC Lanes MAC Lane Speed PHY Lanes PHY Lane Speed Line Lanes Line Lane Speed Oper Admin -------- ----------- --------------- ---------------- --------------- ---------------- ------------ ----------------- ------ ------- 1 Ethernet48 121,122,123,124 25G 200,201,202,203 25G 204,205 50G down down 1 Ethernet49 125,126,127,128 25G 206,207,208,209 25G 210,211 50G down down 1 Ethernet50 69,70,71,72 25G 212,213,214,215 25G 216 100G down down In addition, docker ps | grep phy should show a physyncd docker running. Signed-off-by: syd.logan@broadcom.com

…gearbox phy feature (#4851) * buildimage: Add gearbox phy device files and a new physyncd docker to support VS gearbox phy feature * scripts and configuration needed to support a second syncd docker (physyncd) * physyncd supports gearbox device and phy SAI APIs and runs multiple instances of syncd, one per phy in the device * support for VS target (sonic-sairedis vslib has been extended to support a virtual BCM81724 gearbox PHY). HLD is located at https://github.com/Azure/SONiC/blob/b817a12fd89520d3fd26bbc5897487928e7f6de7/doc/gearbox/gearbox_mgr_design.md **- Why I did it** This work is part of the gearbox phy joint effort between Microsoft and Broadcom, and is based on multi-switch support in sonic-sairedis. **- How I did it** Overall feature was implemented across several projects. The collective pull requests (some in late stages of review at this point): sonic-net/sonic-utilities#931 - CLI (merged) sonic-net/sonic-swss-common#347 - Minor changes (merged) sonic-net/sonic-swss#1321 - gearsyncd, config parsers, changes to orchargent to create gearbox phy on supported systems sonic-net/sonic-sairedis#624 - physyncd, virtual BCM81724 gearbox phy added to vslib **- How to verify it** In a vslib build: root@sonic:/home/admin# show gearbox interfaces status PHY Id Interface MAC Lanes MAC Lane Speed PHY Lanes PHY Lane Speed Line Lanes Line Lane Speed Oper Admin -------- ----------- --------------- ---------------- --------------- ---------------- ------------ ----------------- ------ ------- 1 Ethernet48 121,122,123,124 25G 200,201,202,203 25G 204,205 50G down down 1 Ethernet49 125,126,127,128 25G 206,207,208,209 25G 210,211 50G down down 1 Ethernet50 69,70,71,72 25G 212,213,214,215 25G 216 100G down down In addition, docker ps | grep phy should show a physyncd docker running. Signed-off-by: syd.logan@broadcom.com

…gearbox phy feature (sonic-net#4851) * buildimage: Add gearbox phy device files and a new physyncd docker to support VS gearbox phy feature * scripts and configuration needed to support a second syncd docker (physyncd) * physyncd supports gearbox device and phy SAI APIs and runs multiple instances of syncd, one per phy in the device * support for VS target (sonic-sairedis vslib has been extended to support a virtual BCM81724 gearbox PHY). HLD is located at https://github.com/Azure/SONiC/blob/b817a12fd89520d3fd26bbc5897487928e7f6de7/doc/gearbox/gearbox_mgr_design.md **- Why I did it** This work is part of the gearbox phy joint effort between Microsoft and Broadcom, and is based on multi-switch support in sonic-sairedis. **- How I did it** Overall feature was implemented across several projects. The collective pull requests (some in late stages of review at this point): sonic-net/sonic-utilities#931 - CLI (merged) sonic-net/sonic-swss-common#347 - Minor changes (merged) sonic-net/sonic-swss#1321 - gearsyncd, config parsers, changes to orchargent to create gearbox phy on supported systems sonic-net/sonic-sairedis#624 - physyncd, virtual BCM81724 gearbox phy added to vslib **- How to verify it** In a vslib build: root@sonic:/home/admin# show gearbox interfaces status PHY Id Interface MAC Lanes MAC Lane Speed PHY Lanes PHY Lane Speed Line Lanes Line Lane Speed Oper Admin -------- ----------- --------------- ---------------- --------------- ---------------- ------------ ----------------- ------ ------- 1 Ethernet48 121,122,123,124 25G 200,201,202,203 25G 204,205 50G down down 1 Ethernet49 125,126,127,128 25G 206,207,208,209 25G 210,211 50G down down 1 Ethernet50 69,70,71,72 25G 212,213,214,215 25G 216 100G down down In addition, docker ps | grep phy should show a physyncd docker running. Signed-off-by: syd.logan@broadcom.com

swss-common: Changes to support SONiC Gearbox Manager

d9ce0e8

* add class GearboxUtils, contains APIs useful for gearbox support across various submodules. * add additional REDIS tables to support second (PHY) syncd. Signed-off-by: syd.logan@broadcom.com

kcudnik reviewed Jun 3, 2020

View reviewed changes

common/gearboxutils.cpp Outdated Show resolved Hide resolved

Add firmware_major_version to gearbox_phy_t

c7bec86

lguohan reviewed Jun 8, 2020

View reviewed changes

common/Makefile.am Outdated Show resolved Hide resolved

sydlogan requested review from lguohan and kcudnik June 10, 2020 17:48

kcudnik previously approved these changes Jun 10, 2020

View reviewed changes

remove gearboxutils, will be relocated into swss

7ccec8b

sydlogan dismissed kcudnik’s stale review via 7ccec8b June 11, 2020 17:21

sydlogan closed this Jun 11, 2020

sydlogan reopened this Jun 11, 2020

sydlogan requested a review from kcudnik June 11, 2020 19:55

add entries, needed by sairedis tests

ba5cfe3

lguohan reviewed Jun 15, 2020

View reviewed changes

common/schema.h Outdated Show resolved Hide resolved

lguohan reviewed Jun 15, 2020

View reviewed changes

common/schema.h Outdated Show resolved Hide resolved

slogan621 added 2 commits June 15, 2020 21:07

rename Gearbox database tables, e,g. ASIC_DB2 --> GB_ASIC_TABLE, and …

a9d5f9f

…remove STATE_DB2

fix typo in database_config.js

648b48f

sydlogan requested a review from lguohan June 16, 2020 09:21

lguohan approved these changes Jun 16, 2020

View reviewed changes

lguohan merged commit 292b08a into sonic-net:master Jun 16, 2020

sydlogan mentioned this pull request Jun 25, 2020

buildimage: Add gearbox phy device files and a new physyncd docker to… sonic-net/sonic-buildimage#4846

Closed

sydlogan mentioned this pull request Jun 25, 2020

Add gearbox phy device files and a new physyncd docker to support VS gearbox phy feature sonic-net/sonic-buildimage#4851

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

swss-common: Changes to support SONiC Gearbox Manager #347

swss-common: Changes to support SONiC Gearbox Manager #347

sydlogan commented Jun 2, 2020

ghost commented Jun 2, 2020 •

edited by ghost

Loading

lguohan Jun 8, 2020

dan-arsenault Jun 8, 2020

lguohan Jun 10, 2020

dan-arsenault Jun 10, 2020

sydlogan Jun 10, 2020

lguohan Jun 15, 2020

kcudnik Jun 15, 2020

ben-gale commented Jun 10, 2020

sydlogan commented Jun 12, 2020

sydlogan commented Jun 16, 2020

swss-common: Changes to support SONiC Gearbox Manager #347

swss-common: Changes to support SONiC Gearbox Manager #347

Conversation

sydlogan commented Jun 2, 2020

ghost commented Jun 2, 2020 • edited by ghost Loading

lguohan Jun 8, 2020

Choose a reason for hiding this comment

dan-arsenault Jun 8, 2020

Choose a reason for hiding this comment

lguohan Jun 10, 2020

Choose a reason for hiding this comment

dan-arsenault Jun 10, 2020

Choose a reason for hiding this comment

sydlogan Jun 10, 2020

Choose a reason for hiding this comment

lguohan Jun 15, 2020

Choose a reason for hiding this comment

kcudnik Jun 15, 2020

Choose a reason for hiding this comment

ben-gale commented Jun 10, 2020

sydlogan commented Jun 12, 2020

sydlogan commented Jun 16, 2020

ghost commented Jun 2, 2020 •

edited by ghost

Loading